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

Change-Id: I130816097bc68d1978b035cb2cfb0a3c678f9291