Merge "Mark diagnostic values as either being numerically equivalent to OBD2 values, or providing the equivalent OBD2 value" into oc-mr1-dev