[automerger skipped] [automerger] DO NOT MERGE: BondStateMachine: Check for...

[automerger skipped] [automerger] DO NOT MERGE: BondStateMachine: Check for null before calling getDeviceType am: 39cda2a2 am: ecc5b621 am: 090b2dd5 am: c5101712 skipped: a5fb533e am: 77d4863b am: 5e2e6697
am: df5f053f -s ours
am skip reason: subject contains skip directive

Change-Id: Ia9309fb50eb3f739aadc8ec0333a8c2f1dea7d63