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

Change-Id: I2e37293f6dbaeb8e4b6bc954d3366a36af467149