Merge "DO NOT MERGE - Added translations for emergency action string"
am: d33e79c328  -s ours

Change-Id: I3fe6f222f2c70a0b50147f5439c54d8553dda092