Snap for 7883100 from e6cd5611baca576192093e9405716096b232cbe9 to mainline-networking-release

Change-Id: I442aae5a4e0bde70d57fd19024dfff7ff0e081ed