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

* commit 'cf9aebf138a3ec07277b1e5564751d2396a155c0':
  Remove ExternalStorageFormatter