am 06316245: (-s ours) am 09afe56f: am 4931c657: am 0658d792: am 89a691c2: (-s ours) am 2a8f775a: DO NOT MERGE Change pairing_cb to assume temporary pairing by default
* commit '06316245':
DO NOT MERGE Change pairing_cb to assume temporary pairing by default