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

Change-Id: I1d30271721ea9549ad66d3230d54dee67713f2e1