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

Change-Id: I80f85170981c2f5b1ef949b5db88baf5fc101cd0