[automerger skipped] Import translations. DO NOT MERGE am: 8fc40586d7 -s ours am: ca37ea1acd -s ours
am: fc55e5875f -s ours
am skip reason: subject contains skip directive

Change-Id: I7110480915308735f63f7d511cb07279f7b02dce