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