Merge "fix sensor type comparison between car lib and support lib" into oc-mr1-dev