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

am skip reason: subject contains skip directive

Change-Id: Ideac7e2baee77c605dfb868b3256cf558200b8a2