Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: e30eb8b3ba -s ours
am: 1c568804d4 -s ours
* commit '1c568804d4764ff1b48baf7e50edce69b7ac6726':
Import translations. DO NOT MERGE
Change-Id: I0fad0b2ed5a999c0b0e4925d27e091610762d591
This commit is contained in: