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

Change-Id: I18f9aec026325e0ee42f9a8b228a6f235a9050b3