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

Change-Id: I56f1641dbd0f3180fbce8f88b2571be43dcc68a0