Merge "DO NOT MERGE: BondStateMachine: Check for null before calling getDeviceType" into oc-dev