Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 197da1f978  -s ours am: 5501036062  -s ours am: 01c4a57a8d  -s ours
am: 6b98b4d559  -s ours

Change-Id: Ie18ccbbd3d9583e102c201b8af40e96867bf6f6a