Merge changes from topic "bpfStats" am: e339107631
am: a0b44c329f

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