[automerger skipped] DO NOT MERGE Don't persist bonds using sample LTK am: 292fcf86 -s ours am: e8dea68f -s ours am: dc17388e -s ours am skip reason: subject contains skip directive Change-Id: I368bf6dcf1599b50fce99a9c55fb25bc896996cb