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

Change-Id: I10980637aaa6b9184ce5d5f794cf09d04f9df60b