Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 9724569903  -s ours am: 18b818e2dd  -s ours
am: 126d4923f4  -s ours

Change-Id: I86fa807f86727c28e368370db742300947711e32