Merge "add channel and group tags to the notificaiton logs" into oc-dev
am: 76e76a5c26

Change-Id: I0386428f5a8f8c8c0ac2cec5dc98ad35f5b3042d