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