Merge "Do lazy-unmount to /storage directly" am: 53b0d95903
am: fbc24b5c8f

Change-Id: Id4240e77ce682af6194529d65e47305693ae6cf1