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

Change-Id: I5ab2b1d1e9767e94d0aea73c51d3bc12f151184a