Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: 438c3cbffe  -s ours

Change-Id: I1678c90c02ce16239aabcbf66aa3573d33ea1fca