[automerger skipped] DO NOT MERGE Store BLE keys using the address from the...
[automerger skipped] DO NOT MERGE Store BLE keys using the address from the ble_auth_cmpl_evt am: 8f2f9fff -s ours am: 41e934dd
am: 5fca900f
Change-Id: I7db93eeec1477499642dcc03792e459937aaebd9