Merge "Manually unmount /data_mirror mounts in the right order" am: 9cd3c84dc1 am: 6cdf64a2ef

Change-Id: I6d7e3f2ebf77a29c5f54ea3ad4c284df551403c2