Merge "Change the remount command to be more container-friendly" am: d24c8484c8
am: 677288c80a

Change-Id: I96fdf4c334626649ca0e7437a0d9296758a9b062