[automerger skipped] Import translations. DO NOT MERGE am: 17af9260f8 -s ours am: 682ad3a62c -s ours

am skip reason: subject contains skip directive

Change-Id: I8dcea6f4b0383e77b35def618c5ba7102b631176