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

am skip reason: subject contains skip directive

Change-Id: Ibd2051b6432ef8d74c9acb0a39f8ff823381ae08