Merge "Remove ability to downgrade importance of existing channel." into oc-dr1-dev am: 0d5c1490ce
am: d691f1a200

Change-Id: Ie137cb0decb3ed96d0f3a8d71f04e49446726d7a