Snap for 8564071 from a06f3e32ddac3d4ed41805756b225eb040844c19 to mainline-resolv-release

Change-Id: If36b80843ebe0c7e6467934475d60b434f385658