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

Change-Id: I0c8c1cc35fa6560dd1a40b22544ecd25dc7af0b2