Do not umount roofs even if it is R/W. am: b7a8764a12
am: ba6705f9de

Change-Id: Ia1f3fc0fd119546cf3118e4f6c46079075f38485