Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 26c1e22e29  -s ours" into nyc-mr1-dev
am: 4aeebb0b1f  -s ours

* commit '4aeebb0b1f99153e074577036057d28756751d86':

Change-Id: I03a88b47acd211f42638c705d572da6cc45e9628