Merge "Use /data/media path when migrating legacy OBB data"
am: 88aa295555

Change-Id: Ic321f9dee1c9e6e9fddc16468a74d71b7415226c