Merge "Ensure that LLOB sensor is names similr to other android sensors." into oc-dev