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

Change-Id: I1ade8f813d30742128b890a54cd42e49469c7cb7