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

Change-Id: I878aa9f99481ba1cc2b358d163e6a396ef7c39a9