[automerger skipped] Import translations. DO NOT MERGE am: 34e4c52950 -s ours am: 239a94d3f0 -s ours
am: 2871f35f4f -s ours
am skip reason: subject contains skip directive

Change-Id: I2aac380c84f8336a80dd7ea55de389bc86965d4f