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

Change-Id: Ic4ffe5558fbb0baa525e76dbb14031c4d0cedde4