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