Merge "BondStateMachine: Check for null before calling getDeviceType" into oc-mr1-dev
am: 7a11b2cf89

Change-Id: I20b60af4f9238eb93e6f90ac58e4c338de09080a