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

Change-Id: I0e7da9de55bd7f8b39561aa0a3a9a8b434749ddb