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