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

* commit '5571a986f0a2939248aefc584248d08732c761e4':
  Remove ExternalStorageFormatter