Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 01422e1ff5  -s ours am: 9467382a44  -s ours am: 4a6a014605  -s ours
am: 788000450f  -s ours

Change-Id: I21ac0dd5be2a6a3e510297fd9509847339e2b094