Merge "Add channel group for alert windows notifications" into oc-dev
am: 90a008a0a2

Change-Id: I8728e80027d961d98e39bbbcbbe15788e58f00e9