Merge "Pre-O apps can see Default Channel name." into oc-dev
am: e7fb3c9f26

Change-Id: I0ff65e977dcdd3f5113e0d5fdfa284c5cd987c8f