Snap for 10447354 from f0e069fa0d4f7e7f14e8b27761b9bb70d0f4502f to mainline-networking-release

Change-Id: I990a98398bbe30a747ed0f8c0fe3ae9239a7ed1f