Merge "Change default for group alert behavior" into oc-dev
am: faba1835b4

Change-Id: I622151274ad3d119e7c35ee00b9d3baa1d2efa45