Snap for 10447354 from bbb101d25e92b5dc80aca428fa355d6e27da9ecc to mainline-networking-release

Change-Id: I2b701819fd47fe9eef2f308a2d41d90dbffb897b