Merge "Fix a few known issues in SensorService" into nyc-dev
am: d5194bd

* commit 'd5194bd30cd8284ed65eb63e713fee65c31c9d5c':
  Fix a few known issues in SensorService

Change-Id: I3d4f08c13aa3df52afd0aa4031ad4c6a13ecad03