Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 83a23d290d -s ours
* commit '83a23d290da639131c610521c729f851d13c7112':
Import translations. DO NOT MERGE
Change-Id: Iab80cfac9fae2e5e6963211225fabc8823d12ac6
This commit is contained in: