Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: e82b728101 -s ours am: c0ff60f272 -s ours
am: cf8be6d4e0 -s ours
Change-Id: I5230dc3bb40e16f487e7e36fb8bed0d007bf3f6a
This commit is contained in: