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

Change-Id: I55b989091dad00ec6a9380f9b59f42be8d716d76