[automerger skipped] Import translations. DO NOT MERGE am: 7a762b564f -s ours
am: 82d7d3d88b -s ours
am skip reason: subject contains skip directive

Change-Id: I2aa8e2f4b91f3e45667d20db8f8c5a29cb83d026