Snap for 11670064 from 765b68f8ee17754f66abefd8a9b5ba312bc73e15 to mainline-networking-release

Change-Id: I19b05fdafa7b925c39afd993aa3ca67fc82072c8