Merge "Import translations. DO NOT MERGE" into nyc-dev am: 237b52f40c  -s ours
am: 1bef62e488  -s ours

* commit '1bef62e4880427e73dbbc6f95af4ae0454fbc772':

Change-Id: Icb0063153a530ec9127476c5d689a382653fd283