[automerger skipped] Merge changes from topic "ifaceStatsDetail" into pi-dev am: e696cf636d  -s ours
am: 6f0b8dfeca  -s ours

Change-Id: I885775a92a7fde71f4ea5b6167045aab2600bc1a