Merge "Fix up ExternalStorageFormatter."