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

Change-Id: I9bf87eb65cb6f3d5d4a5ce0bc4145cc021e8a542