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

am skip reason: subject contains skip directive

Change-Id: I35fed3bc176f0939f3934e2ec088ce2521e95106