am 89a691c2: (-s ours) am 2a8f775a: DO NOT MERGE Change pairing_cb to assume...
am 89a691c2: (-s ours) am 2a8f775a: DO NOT MERGE Change pairing_cb to assume temporary pairing by default
* commit '89a691c2':
DO NOT MERGE Change pairing_cb to assume temporary pairing by default