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