Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: 595ee3f464 -s ours
* commit '595ee3f464e4a5ecc2f3f0a46bea6b6ab4a15a8f':
Import translations. DO NOT MERGE
Change-Id: Iddcd855590f3b5d066c218d0ca5d2b15d37637f3
This commit is contained in: