[automerger skipped] DO NOT MERGE Don't persist bonds using sample LTK am: 757c395f -s ours
am: 5dd2c669 -s ours
am skip reason: change_id I52fd484d42bf87e96dbc9e6456090f231ed48111 with SHA1 342e5538 is in history
Change-Id: If68cf83db0a7388146f4e28a8433f8bd4c402e72