Merge changes from topic "ifaceStats" am: 90c01b0093
am: b86d2b4b84

Change-Id: I460bc25806182bc2dc5fcc2512ab01e776a0e8e6