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

Change-Id: Ib52da25c6e148ee7c1416be02aa5b78779b3dedb