Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 2c0df72ff6  -s ours am: e566e3ec43  -s ours
am: 9125f16353  -s ours

Change-Id: I1bea72440a258cce98cbf8dc064c0b78e45dd3aa