Merge "Do not umount roofs even if it is R/W." am: 43567e39dc am: 22782a7269
am: 34e13498dc

Change-Id: I8b3c0cefd23d5e7e44da02e13cc173472834b070