Merge "remount: Create a bigger scratch partition on /data."