Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 3875d1a103  -s ours
am: 995029b529  -s ours

Change-Id: Iea953c1a17f18528e1c3ae5b3663419745e88b79