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

Change-Id: I892cb57187ad5229701d24112490ac48182c5319