Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: b094ba47a7  -s ours am: acb237644c  -s ours
am: eb4bd930d8  -s ours

Change-Id: I08944b2433ac71b1c950baaf43c91865dece6df8