am e4f0dc30: am 2ea0c67d: Merge "Sensor changes." into jb-mr2-dev

* commit 'e4f0dc300a22dbcd9081558d2844c6062b4cd380':
  Sensor changes.