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

Change-Id: Ibfd1760a251c164b392fb64640fc0c39e4ac0556