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

Change-Id: I2857f19f1a47419aaf133b4c771d9da7d905357b