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

am skip reason: subject contains skip directive

Change-Id: Id5039c4a3a3a8d94d9b565fe09e9224226a0de05