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

Change-Id: Iace132d56c0aac76a884cbcd06a1e4a60e094791