Merge "Remove ability to downgrade importance of existing channel." into oc-dr1-dev