Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 7efa4cc6de
-s ours
* commit '7efa4cc6deedd3e5a3443b294698be1c007e25e1':
Import translations. DO NOT MERGE
Change-Id: Ie703cc9ee56a69091d7f570f0a9f07101469f330
This commit is contained in: