Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: 4ce8e19231 -s ours
* commit '4ce8e1923168f0ccbd0e7c5acd159c827d55f101':
Import translations. DO NOT MERGE
Change-Id: Ibc743845940e3d6f43b6d54f2d991fe8fa2d2a94
This commit is contained in: