Merge "Align "Emergency Alerts" terminology"