Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 3ff12c2a1b  -s ours
am: 75fda68e84  -s ours

Change-Id: Id869d5122151efbda701351f175831d7b8caf078