Merge "Import translations. DO NOT MERGE" into nyc-dev am: 7ffeda3633
-s ours am: 5736532e19
-s ours
am: 9a0da1eb79
-s ours
* commit '9a0da1eb79e132bd0ae7450da11e5e606a64e5fc':
Import translations. DO NOT MERGE
Change-Id: I5ed8201864c9d27c9e9d7fc865680498373457ae
This commit is contained in: