Merge "Prevent incorrect alert triggering" into mainline-prod