Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: fc9ad02469 -s ours am: 3f578ad25e -s ours
am: 424dacefec -s ours
Change-Id: I912a77158aa08b1685f34f0afb7a4c02f6ebcd0a
This commit is contained in: