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

am skip reason: subject contains skip directive

Change-Id: I58831cfec6d8dcb1c84c03c87cedd932e8abe75b