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

Change-Id: I541c140a9244f7671b3a09f19a4e0ff7acef4f0f