Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 43905cc9ac  -s ours am: 3b2c3fe5ef  -s ours am: ea109fa2c7  -s ours
am: 3882273957  -s ours

Change-Id: Ifbad3f8490583242e7d80397b5f3b975e88d0830