[automerger] DO NOT MERGE: BondStateMachine: Check for null before calling...
[automerger] DO NOT MERGE: BondStateMachine: Check for null before calling getDeviceType am: 39cda2a2 am: ecc5b621 am: 090b2dd5
Change-Id: I69782cab6e333346e887a930f78fc0d7bb20e194