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

Change-Id: I35674766755af5c0a21655855fadf4c5bf04d0e3