Merge "Unmount bind-mounts on top of /data before unmounting /data" am: e4b931146d am: 7fe4852d3f am: dd1ae58705

Change-Id: I1734bc87d4aae0eb83f979c6e99ce6b79a688720