Merge "Return to modifying raw /mnt/media_rw paths." into pi-dev am: f7d3e028ae
am: 1394fd25ca

Change-Id: If6904b6dc431dab74e326b75f37b58ee3c99feef