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

Change-Id: I3c4017b2b089fafacf6b6951ca62da054363827f