Merge "remount: Use /data for backing scratch storage." am: 21dcbd15bc am: 563e1b6a99

Change-Id: I7853dd3e12ff6258e4fc61c53264feda77af10ce