Merge "Remove use of MeasureUnit.internalGetInstance" into oc-mr1-dev
am: 61faffd75b

Change-Id: I58020aa141a55750059a57063cea30bcc706e908