Merge "Change default for group alert behavior" into oc-dev am: faba1835b4
am: dfd7810288

Change-Id: I8808afb221d2ae18424d9d37c522957b34dd99a6