Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 94942bb070 -s ours
* commit '94942bb0707cdf1430d0cd83909ad2ce87ea5f5d':
Import translations. DO NOT MERGE
Change-Id: I06870a02ce164ccca366aedaa44c4273585a0421
This commit is contained in: