Merge changes from topic "StorageUnitTranslation"

* changes:
  Revert "Switch file size formatters to use ICU's MeasureFormat"
  Revert "Remove use of MeasureUnit.internalGetInstance"