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

Change-Id: I8612211ea13a7f66963d2b378db3e5c3049a6c72