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

Change-Id: I7c71490236b10229b9592e57511a8f7e4679be49