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

Change-Id: Iad3165a37e54476bffa7396f7b180da6ca673a3a