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

Change-Id: I7f10873a29a057e8b3e0e7707763e84e8854eb11