Merge "Fix deleting Misc channel for o-aps" into oc-dev