[automerger skipped] Merge "DO NOT MERGE: BondStateMachine: Check for null...
[automerger skipped] Merge "DO NOT MERGE: BondStateMachine: Check for null before calling getDeviceType" into oc-dev
am: 8e45731c -s ours
am skip reason: change_id I711e08b076adb7b4808d04a47cb067cb95606f96 with SHA1 39cda2a2 is in history
Change-Id: I062ba4d23055ce7b43faad3481e5f0d50bbf4be8