Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 4a1e89ba44  -s ours am: 440c56cef9  -s ours
am: 17de25c7fd  -s ours

Change-Id: Ie78873fe59a88a4412060ceb78149ab1361d5e73