Merge "Import translations. DO NOT MERGE" into nyc-dev
am: f9a6f33091 -s ours
* commit 'f9a6f33091772b847cf1580021530cdf5004c035':
Import translations. DO NOT MERGE
Change-Id: I19a2537c01efc8b4e47d64778d675bbed498b782
This commit is contained in: