Merge changes from topic "ifaceStats"
am: 3f675c25e0

Change-Id: I0b564b2d3b13c0e5d033c5cf4aaddad3a750f2c7
tree: eb2066eb9352cc8908ec54b8a5f21f07beca72da
  1. core/
  2. services/
  3. tests/