Merge "Sensor changes." into jb-mr2-dev