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

Change-Id: I34bba274f0abd88ef33f1d9bceb43a6e8bbf4ce9