Merge "Change the remount command to be more container-friendly" am: 23aea56b97
am: 8f2138ea14

Change-Id: I96fdf4c334626649ca0e7437a0d9296758a9b062