Merge "Delete default channel for all apps targeting O." into oc-dev
am: b9ee2d4677

Change-Id: Icef88789844286860a348fab200ec8169dabbe51