Merge "DO NOT MERGE Fix unexpected behavior in Bluetooth pairing" into nyc-dev