Snap for 8570526 from e863e8b505c2a6ab4a881966460c27cc5e645fc0 to mainline-networking-release

Change-Id: Ia53a65bbc1d38c01325341460807d693e84969c2