Merge "PbapClientStateMachine legacyCode removal."