Merge "Migrate primary external storage."