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

Change-Id: I41ff5e62cefb7fa5d63f36d463e974af90b434ef