Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: 06b1de25af -s ours
* commit '06b1de25afb1a2bfce1cfc38a88584efc7d73c2f':
Import translations. DO NOT MERGE
Change-Id: Ic2199da26da3980ac74c09b92b6b39a83ec9e133
This commit is contained in: