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

Change-Id: I2c05e5319cefd6da5433273e040a667aa161cafa