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

Change-Id: Idaeaf87d8d0c73047656d201b8b5fc37793f30d7