Snap for 8564071 from 2536fe25a69f90b7c380dc4ddff269403ebe9a0b to mainline-resolv-release

Change-Id: I58fd14a59be4f47db24a56dd14703f7e2e700e7d