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

Change-Id: I167f941e2f09f240dd6109f849ccd87dee57f47c