Snap for 8564071 from 3194ed7fc8b659d00e0bc363f51bab8f686fc4e2 to mainline-resolv-release

Change-Id: Id2fda97733cf7194654023d994c355fccb666425