Merge "Channel settings updates" into oc-dev
am: 526185c89b

Change-Id: Ibb9cb726d26579ce94f26e18d00bcca73061b9e6