Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am: d74b5f551d  -s ours

Change-Id: Iffab34c61046aeeca37a906107f4183952156654