Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 12bef8215e  -s ours
am: b5d41b359e  -s ours

Change-Id: Ic1fba8f4f06e559c1c123f273f3357149bd0f3c7