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

Change-Id: I639c8b667e83657d0bf4a25285e57548eef6c876