Merge "Add new sensor types." into jb-mr2-dev