Merge "remount: Use /data for backing scratch storage."