Snap for 8570526 from 39ec5f1a3b09152436701de9f0fab44f9e600112 to mainline-networking-release

Change-Id: Ia64322d762b6f1395c64738fcf08f56af8fe352f