Merge "Eliminate the inconsistency between the states of AMS and TSMS"