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

Change-Id: Id6245186681dacd5ac55d9be719080d22d32bbd1