[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: 6c931823 -s ours am skip reason: subject contains skip directive Change-Id: I5594c2a292a9754900e8c574cc859f51dbc4442c