aml_net_341411030
Snap for 11185025 from ae66a810d4b092e38c7dc0313c1eb649f51716ec to mainline-networking-release

Change-Id: I910d38e38ff2ad5ed1858b06cad60d4246778e75