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

Change-Id: Ic904dea0b0cddcacaff7cff6665769637f121982