Snap for 10447354 from f683c0e239349b9de71deafa96848391466930a3 to mainline-resolv-release

Change-Id: If9a9a61a4130ebc1c4c0670bd898276f9e50a054