Snap for 8164116 from 1fdf2c966498ac8b89b0815a270baf0b1841754e to mainline-resolv-release

Change-Id: I147db7cd14b9dcd2634c3303064dc2531f56ea9e