Snap for 8570526 from b28279ad6d3c1b739fe284223523bc240cd60f39 to mainline-networking-release

Change-Id: Id8dec245c8852a9bfcb5a5c2bc6498ec2e925355