Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 5282bb5ee7 -s ours
* commit '5282bb5ee71aa22cd9b943994e7af773730acbed':
Import translations. DO NOT MERGE
Change-Id: I724eef86f050bdd1f8ee9ba9ba1c8d2c302267c2
This commit is contained in: