Merge "Fix an issue where OEM pref tests don't clean up correctly"