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

Change-Id: I364d21030fb62f1355e91d67459d418d69af5660