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