Snap for 7550930 from 6432d0aecc51c0448e291d20db74a48cf36ef2a3 to mainline-resolv-release

Change-Id: I7e39e74d5de292528fb94cb26a106934401351ed