Merge "Revert "Treat apps that use channels as O apps"" into oc-dev