Merge changes from topic "bpfStats"
am: e339107631

Change-Id: I488be110cca66990f44f6e45d5489ce23f36432e
tree: ad97972a34fbf27b12b0e2f1b3dfa55e560ec2c1
  1. core/
  2. services/
  3. tests/