Snap for 8570526 from bd84896d5ae56ea80cabb9f396ba968941d7e917 to mainline-networking-release

Change-Id: I273120a99a2f40e70f65f033939d6c06d8488c18