Merge "poll umount completion from /proc/mounts" into oc-dev am: 4d4348c771  -s ours
am: 4fa5c37090

Change-Id: Ic79c0790eae9f8eb009664aff1e50237fa111172