Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: d5d5dc2473  -s ours
am: 7640ef24d1  -s ours

Change-Id: I6d733530f0fb6ab39ae4819e40cd5d5fbd47ff8e