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

Change-Id: I0932073613c853f44082f6e7df4e30324364cc68