am c8a1b367: am e225f6fd: Merge "SensorService fixes." into lmp-dev

* commit 'c8a1b36745e2094e5fdc7915739caca396c2d9de':