Snap for 10447354 from 30df5b9f35d47299a0d6eed8b86558b59432da3d to mainline-resolv-release

Change-Id: I1e0aa9b7d0f4903743c9e2776374effd32af8fa0