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

Change-Id: I4eb02e0ebc0132f8d434c51fe53cc648d8310293