Merge "Show misc channel with pre-upgrade fields" into oc-dev am: 34bc4af810
am: 9bc7405c30

Change-Id: I4e06cc0af1b18a3457ffa40ae42d9e506ab8822e