Snap for 8564071 from 7b50b3f18e06b9e9b78bd4487e7cdfbe1982391f to mainline-resolv-release

Change-Id: I080b2c5c5aa124f4608dab8ef6ede0204436a32a