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

Change-Id: Ia897c5436b082826928ca52988d0a4e235559886