Merge "Import translations. DO NOT MERGE" into nyc-dev am: a68d1f10e2  -s ours am: abd7b12ada  -s ours
am: ee5dd4e899  -s ours

* commit 'ee5dd4e899262f89c53b71a6f14bed53d0060426':

Change-Id: I33b90afa3448c8ea8cd5f757e9aa6400dea8ceed