Merge changes from topic "ifaceStats"
am: 90c01b0093

Change-Id: I0b564b2d3b13c0e5d033c5cf4aaddad3a750f2c7