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

Change-Id: Id88552a95441037ef5825a81311a95b9dd66ac73