Merge changes from topic "bindprocess-resolv"
am: 643e60b0fe

Change-Id: I3aacc6c2ae5242e28eec6e9e8e2a9a4b3e4f715d