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

Change-Id: Ib625fe59822f41c7fae90828da9ab17f836e9e5a