Snap for 7550930 from a2707050575cdf1c3a3519c0a6bc0535a581c6a1 to mainline-resolv-release Change-Id: Ifd1365a194bcc3faf2b4d47efb1489eb51b0381d