Snap for 7550930 from e1258daf2fadde69249612f3f447b6841abdb4b2 to mainline-resolv-release

Change-Id: I6abacb93703e83c7246165483b8e96b224c55d69