Snap for 9224945 from 12cbcd4b908e8d34431e9aebf0fc36e4457bb6a1 to mainline-resolv-release

Change-Id: I3aac1585485c7f955f000a1790ce536a6234164f