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

Change-Id: If640c3620ec35d1ec4a4896ed182f0565f29c180