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

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

Change-Id: I52581e91b35c99e0f626d4099f51c7a649c2911c