[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: 9f78214f -s ours am: c9f32dd2 -s ours am: 0f850987
am: d5f5d417
Change-Id: Ie40ba59c57628ef89e8951225551a08140e7402f