Snap for 10447354 from c4f3de3d4009f35b4f6e9c0dda3710f84fe2b79c to mainline-resolv-release

Change-Id: I75180455f3f903b1f93a4894dd3d135986bf305a