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

Change-Id: I3364dd67095ffcf25a4d33e0c25cc93d2cc7aa50