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

Change-Id: I67ed2f231469df398e1348e83f79bf5aace2eb20