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

Change-Id: I55fd48916999fab547e7cd1f9ba7885a8ed7afa6