Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 438c3cbffe  -s ours am: 545c97d0b8  -s ours
am: fa25ce0fe4  -s ours

Change-Id: Ie7104c1a647ecaf309093fbee6ebf4c3519d3f52