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

Change-Id: Ie1d25ecf377a023833f29c01f093831f049166fd