[automerger skipped] Import translations. DO NOT MERGE am: 69d02d1457 -s ours

am skip reason: subject contains skip directive

Change-Id: Ib03172b4426713fb3b9fbe81568e99573cf44663