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

* commit '2ea0c67da6770a840d871a69c61bb52d73dadf2b':
  Sensor changes.