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

Change-Id: Ie9986fe8723ed34ecc787deb72bd75c89f1e8554