Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: ae8a460985  -s ours
am: 3a2ad08776  -s ours

Change-Id: I4397b4a61662118253d44be953c02e324eca9d15