Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 9066f06 -s ours
* commit '9066f06314723bd10edd2557749dd2377f4b6552':
Import translations. DO NOT MERGE
Change-Id: Ice57aa754187f6a9ccccae0f461560c5898176ad
This commit is contained in: