Merge changes from topic "bpfStats"
am: 6e03224697

Change-Id: I488be110cca66990f44f6e45d5489ce23f36432e