Kilo L2 agent improvements

Change-Id: I51a351a53ab896661b65a18bc2993a7ed232b0ac
Merge "Kilo L2 agent improvements"