[automerger skipped] Import translations. DO NOT MERGE am: f5518dfcd7 -s ours am: c1b21b1ef8 -s ours
am: 80437c761a -s ours
am skip reason: subject contains skip directive

Change-Id: I36ed9f0b19cd698882706957b8f6f973995eca18