Snap for 8906261 from ed1361fda9f40193b7d9cf715bb4b450429f38b3 to mainline-networking-release

Change-Id: Ic07b9d4d794e483b0a98345ca2bdcaccdf4a0989