Snap for 7550930 from f5396362d5ee4eb152d126cbce68c65410b8a030 to mainline-resolv-release

Change-Id: I3daf7db2293eba342385771a65039f06548eeddb