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

* commit 'f5d6d432af57722e951d88a420b189c45a243d4b':
  Remove ExternalStorageFormatter