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

Change-Id: I4a4f6d3319ed7251ce5e3de1dece65ae62c72397