Snap for 10447354 from 06387f8b991242b15b54a46445407306b5e34764 to mainline-resolv-release

Change-Id: Ice54f022b33f9e3c2a1d339500af44df5f2bd2cd