[automerger skipped] Import translations. DO NOT MERGE am: 9a60ed5ff6 -s ours am: df2e0f3872 -s ours

am skip reason: subject contains skip directive

Change-Id: I09b8c0b1756bb043a16fbcdd5554330ba82bb2c8