cherry-pick from vold-test to fix mass_storage