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

Change-Id: I33e2836cf2560848cbb35d25df34757672960ac1