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