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

Change-Id: Ia23d8aacf06e97fb6934e55f793ab0158425443e