Snap for 10447354 from e52af4761e6fc732bee08f4fe76b67c964a1f311 to mainline-resolv-release

Change-Id: I52f623ada85392f4212dc2ccaf283faf6a78a5a3