Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 60c9a61b93  -s ours am: 7dbdcdd289  -s ours
am: b346b823e2  -s ours

Change-Id: I5ec0f70ce362d2723a2d24376029f0d3eee1adda