Merge "Remove unnecessary whitespace from enum members in OBD2 properties" into oc-mr1-dev