[automerger skipped] [automerger] DO NOT MERGE: BondStateMachine: Check for null before calling getDeviceType am: 39cda2a286 am: ecc5b62100 am: 090b2dd50f am: c510171295 skipped: a5fb533ed4 am: 77d4863bd1 am: 5e2e6697ec am: df5f053fb0 -s ours
am: 73c9932c96 -s ours
am skip reason: subject contains skip directive

Change-Id: I8ac32038f24d8100dfdc312ec76815f3e7553815