Merge "Change TAPI topology to use correct states"