Snap for 8564071 from e434c5c38262b4ed6ffdc00d3b5f9fc13471c203 to mainline-resolv-release

Change-Id: I1977c012d039860b0784a51808a53ab08697b79c