Merge "poll umount completion from /proc/mounts" am: 625a098573 am: cb4dadfb08 am: 4c44243c45
am: ae56bc7efa

Change-Id: I2240b1e31c6c0b92a7fc6e3da271a1d00738efa8