Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 4e3fe5c7d8  -s ours am: 3f8d11d863  -s ours
am: 6639280e93  -s ours

Change-Id: I33b68effea332c079c05ab3b0b324093bf4969bf