Merge "ExternalStorageFormatter takes an optional StorageVolume target." into honeycomb-mr2