[automerger skipped] Import translations. DO NOT MERGE am: 0eacfbd699 -s ours am: aa6934848d -s ours

am skip reason: subject contains skip directive

Change-Id: I9c123b8def41ee41eeb5770a30bec98ada3ad127