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

Change-Id: I75d4c29538e109ce4de09e055591e1eb61e537da