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

Change-Id: I3d4eed2059eeb261f9544fa3e1584d7e881671b9