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

Change-Id: I126f04e8551e68b74b076bea10f30964b8d2be00