Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 5ffabbe58b  -s ours
am: 987866df87  -s ours

Change-Id: I004b43f4084e804c79e5b75b2e61448ecb4b0bdf