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

Change-Id: I89607e6075c64d4b25c2794b74cc60b4d35e7344