Merge "Revert "Change default for group alert behavior"" into oc-dev am: 6e96251d92
am: f9f6424adb

Change-Id: I46ff1e1af158a8af1a27da04304a7bda4a60ebe9