Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: 9d41bf11df -s ours
* commit '9d41bf11dfbf2e239babedd580c2fa45aef036d7':
Import translations. DO NOT MERGE
Change-Id: I54cc8b7c4d7dde1567661beb2055e0c3e7011c2f
This commit is contained in: