Snap for 11185025 from 626de530b0f00b20fc4dc4d7a29b136b48ec6590 to mainline-networking-release

Change-Id: I3786c73b693bbe2658bf07d6b32632d40c674831