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

Change-Id: If434921580905cc668c9f4d4294124b9d534baa0