[automerger skipped] Import translations. DO NOT MERGE am: 3ed1ff72a2 -s ours am: d6bc1479a3 -s ours
am: a7709d12bf -s ours
am skip reason: subject contains skip directive

Change-Id: I5464e32d98f9de01afb9399e7ac382328bc3fa42