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

am skip reason: subject contains skip directive

Change-Id: I984d6fe864b26aa2eb29bc457d04ec02fffcf3bc