Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: 94f982c1d1 -s ours
* commit '94f982c1d13de9185cc80e62ce15b52e1f9ed6c2':
Import translations. DO NOT MERGE
Change-Id: I3043a31e7be0ef5dc2d66633c563028fb18c2cdf
This commit is contained in: