Merge "Log when an app targeting O does not specify a channel" into oc-dev