Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 6856972e4b  -s ours
am: 4fb97691f1  -s ours

Change-Id: Id1b8769304a7ceb182364c562156cf64cc92f2eb