am 474f987d: am f5d6d432: am cf9aebf1: Merge "Remove ExternalStorageFormatter" into mnc-dev

* commit '474f987dd783493967e9ea899398f6965a7d3515':
  Remove ExternalStorageFormatter