Merge changes from topic "ifaceStats" am: dfd8e7ffff
am: da795087a6

Change-Id: I460bc25806182bc2dc5fcc2512ab01e776a0e8e6
tree: 5a9541fda952716cd17a4bfd4d7778cbb7fa8a3f
  1. core/
  2. services/
  3. tests/