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

am skip reason: subject contains skip directive

Change-Id: I20b7a8bbf03d700346553d1000bcd516fbfde8f8