[automerger skipped] Import translations. DO NOT MERGE am: 9248f8bd8f -s ours am: 65e5e15fb7 -s ours
am: 18a182693b -s ours
am skip reason: subject contains skip directive

Change-Id: I3b2b23dba31ae5213b7f4e3e1344ff1009fe7488