Merge changes from topic "am-e8b13d24-dee0-4f84-89d4-8a7d110f6ec1" into nyc-mr1-dev
* changes:
[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: 4f58c19a am: e25ebddf
[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: 4f58c19a
DO NOT MERGE Fix unexpected behavior in Bluetooth pairing