Merge "Protect /mnt/scratch from stale umount on userdebug" am: b39e6f2887
am: 74a6c69e57

Change-Id: I016328c6059f63fb73c628b746ab12fdfe57d6a4