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

Change-Id: I428f022461de19aa0e3190884387deb819938e0b