Merge changes from topic "bindprocess-resolv" am: 643e60b0fe am: 291e3726cd
am: 7a71796b0a

Change-Id: I3f35e6719db4a1152281d1143e8756e726d51e64