Merge "Remove use of MeasureUnit.internalGetInstance" into oc-mr1-dev