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

Change-Id: I27cb864d6240d9fb8440b249c180ac8ba835b2c0