Merge "support notification channel for non owner users" into oc-mr1-dev am: 54a3129efa
am: f6461cac17

Change-Id: Ib8262fddd09b1c7794c9f12d128250c4866809ad