Snap for 7917794 from 2e5a3bac0f6e6f5d7e3f79ff388bdabfe2b88db2 to mainline-resolv-release

Change-Id: I906c03852ebd0026b1cc8355da4f3f57db928680