Snap for 7649214 from 40f81b12cd9557f1242808535f811f6bd0dcb381 to mainline-resolv-release

Change-Id: Idbcd9b7bb5f37d4a323417cd7b7f005ee5d3d9df