Merge "DO NOT MERGE - Added translations for emergency action string" into nougat-dev