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

* commit 'af5045cbd992269febc09ec6d63b4303e42ca402':
  Import translations. DO NOT MERGE

Change-Id: I7d4ba853ab4ac955a93929538d51b3bd4810560b