Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 9724569903  -s ours
am: 18b818e2dd  -s ours

Change-Id: Id9ad618535461c7d0b60bf324d286980073ab52f