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