Snap for 7550930 from 16f96a2cb9f5d2764be7d8fad4eac6ae7167cd92 to mainline-resolv-release

Change-Id: Ie20fca7cbc236d1c733d31a0715aa8136056c516