[automerger skipped] Import translations. DO NOT MERGE am: c054f231ae -s ours am: 2f0bcbd3dc -s ours

am skip reason: subject contains skip directive

Change-Id: I00fdad75d032ba9633c7510df2f5022cdcf7b400