Snap for 8819477 from d5d782904fc19954c1e112692b40cffab9729225 to mainline-resolv-release

Change-Id: I03928d727f25595d26ad8f3b570e58d5ba04e7cf