Merge "In apps with no channels, provide settings for misc channel in top level." into oc-dev
am: cf172040a9

Change-Id: I590ad5b3f2ef6fd5b578e9bdc37d1999d3091a77