Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 618d5b354b  -s ours am: b6cf3d2d64  -s ours
am: f463b3c691  -s ours

Change-Id: If79235e1edcdb263ef577da49d8b8dcf7e2bc027