Merge "Merge "Unmount public sdcard filesystems before killing the fuse process." into nyc-dev am: a4330be am: c1428a5" into nyc-mr1-dev-plus-aosp
am: 04c341b

* commit '04c341b0ebd3e5519efd68f5bb38728ec0fe1520':

Change-Id: Ib7e296f8eb567d676ffaa482e2b3745477322fa7