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

Change-Id: I2d9bc9ba84109408d765d2af34020f7d49921e2f