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

Change-Id: Id43d707386950c50d6dc1e01970223cd2e5b0763