Snap for 8701348 from e4819095405163a12bf42aeb40c1411a85216566 to mainline-networking-release

Change-Id: Ie492dba607a791978b701feee5e44f9d586eb622