Remove channel pids from reports
Merge bug26090
Merge in default