Merge "Import translations. DO NOT MERGE" into nyc-dev am: f79616b427  -s ours
am: 88fdea080f  -s ours

* commit '88fdea080fd9aa1ac2c31a8a2cb0ace3a0be924d':

Change-Id: I227274dd96491fa95ba34f4cc611a88f674ca5d8