Snap for 8570526 from b6c4ab13d63f799b51fcc22cc9423e8440d99eea to mainline-networking-release

Change-Id: I6bd166f0204b7ef52375168332c2399744c1e29d