Snap for 10447354 from f0e069fa0d4f7e7f14e8b27761b9bb70d0f4502f to mainline-resolv-release Change-Id: I0fd3b6883b7cbb0e70b6dc0fa5813a06a628b4bb