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

Change-Id: Ibec3557681ab54be71109d728121b13a6a5df182