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

am skip reason: subject contains skip directive

Change-Id: I68462b8db4b54ab2bd8d07d884a358cd9ccfe715