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

Change-Id: Ia9191ca4704c04bfd5c3e4bb5aedd698149ea549