Merge "[automerger skipped] Fix missing group alertOverride recalculation am: 2592ea1fc8 -s ours"