Snap for 8905985 from 1ce5be5b7d6e5e8b0634492723ca57fd3bb86e83 to mainline-resolv-release

Change-Id: I7778103f992583661ddacbc08ab188195a809da4