Merge "Import translations. DO NOT MERGE" into nyc-dev am: cace07e727  -s ours am: 337c1b1108  -s ours
am: 9e14fb3c67  -s ours

* commit '9e14fb3c6733bdad087eb3fab7913f612e363bb7':

Change-Id: I0cb8df5f9a8693ddbefb0dd63ad1eeb8e5cfbf4b