Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 7d84e110cb -s ours
am: 2ac7d7f022 -s ours
* commit '2ac7d7f022556c84d206520c3e7221cc6824ffcb':
Import translations. DO NOT MERGE
Change-Id: I5186dd983d6146b1427b6fd8323a46d6505beb30
This commit is contained in: