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

Change-Id: I5861de916615906a4962b1af14c2dc5af701af75