Snap for 10447354 from e63db8559cb08a2b5ead90563dc1da479d6c5214 to mainline-networking-release

Change-Id: I7571de378e7fe8d0ddfda108cf496228ad3f4489