am b9b58865: am 2dee3b89: am a61e34d9: am b38d90ae: (-s ours) am cb72cfbf: am 06f8fdfa: (-s ours) am 0471a304: DO NOT MERGE Change pairing_cb to assume temporary pairing by default
* commit 'b9b58865':
DO NOT MERGE Change pairing_cb to assume temporary pairing by default