[automerger] DO NOT MERGE: BondStateMachine: Check for null before calling...
[automerger] DO NOT MERGE: BondStateMachine: Check for null before calling getDeviceType am: cebf7b93 am: 13f0e72c am: d0037c57
Change-Id: I69782cab6e333346e887a930f78fc0d7bb20e194