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

Change-Id: I0ea16db9bf036f040be81c79bd8c94fc8543214e