Snap for 9554547 from fe94a87a6437fe218c8e0dc58aa608ce197f2f68 to mainline-networking-release

Change-Id: I89a0806f184e224e58d0b8bdbf9a4c03251ba503