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

* commit 'fc22bd87ff22c87eaf7a9dc912f8184a0ce459bd':

Change-Id: I37fee1718ad7261787be24620ccb27f80c90be80