Merge "Import translations. DO NOT MERGE" into nyc-dev am: 7ffeda3633
-s ours
am: 43a6de268d
-s ours
* commit '43a6de268d5996f94eaa3c7f154a7cdf5d2c46a4':
Change-Id: I86c55dd3e0a2d2dc926e0599b63d2f53e04b0dc3
This commit is contained in: