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

Change-Id: Ie6fc3a126124a61c09c6aababb1da7893bb7eff7