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

Change-Id: Id9b2083a6caa9e8c49ff4c356491ec177a717754