Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 20088b3e31  -s ours
am: 2b1a252a5c  -s ours

Change-Id: Id3b30de9325aa23a3c39f355d1eac3976f0637ad