Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 544c68a -s ours
* commit '544c68ade88e9cf00ae80134e6cefedb18eb01c6':
Import translations. DO NOT MERGE
Change-Id: I98974cec810c6226c50a5fd843d850a3439a369f
This commit is contained in: