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

Change-Id: Id18279ec5ccafbdcc0b4de8c24342f2c41ae9d10