Merge "Import translations. DO NOT MERGE" into nyc-dev am: ef2989920d -s ours am: f089201e2e -s ours
am: 2e03e4651a -s ours
* commit '2e03e4651ac37564da484ae44e52be7b16aa0e96':
Import translations. DO NOT MERGE
Change-Id: I0a362e73647cb372fc76961e6d872c95840c739c
This commit is contained in: