Merge "Merge "Treat apps that use channels as O apps" into oc-dev am: b0744b820a am: 65c95aab05"