Merge "Import translations. DO NOT MERGE" into nyc-dev am: 83378cb136  -s ours
am: 564210ad8c  -s ours

* commit '564210ad8c81ec796ce40936e1f387fe91f95a7f':
  Import translations. DO NOT MERGE

Change-Id: Ib6dd28a1f419653f35351d97ad0a48bdbe72072d