Merge "Now for real unmount bind-mounts on top of /data"
am: ee08c978d2

Change-Id: Ib5a3d90e8d4e58f6812e9481577e11e6e9aa1ccc