Merge "Merge "Fix channels --stats dump" into pi-dev am: 5de9459c81" into pi-dev-plus-aosp
am: acc6c95718

Change-Id: I170d8472d8b330caeba25ce1c4ebcc5d36a4fbeb