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

Change-Id: Icf5989d2e0cd7dc95fab6507067520a961b08be7