Snap for 8564071 from b2486ad9e829b8b175ed96970ccc41d7167b748f to mainline-resolv-release

Change-Id: I8d892a1ae1496264e3c11797a466e63b452f5d21