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

Change-Id: I9abea6839d3fb056d80e8f8301ac3f47ad09f1d7