Merge "Remove use of MeasureUnit.internalGetInstance"