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

am skip reason: subject contains skip directive

Change-Id: Ib80c795a02445a85ac0b4fd3a60de95509a64931