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

Change-Id: I0427d5fcc7a93893de057175286ea44853a59ede