Snap for 10447354 from 23e8e5196456b787d5e78c4744b76946a8535732 to mainline-networking-release

Change-Id: If896f33125790ee3f63938333debcc2295e1c245