[automerger skipped] Import translations. DO NOT MERGE am: 93ad528bac -s ours am: d3f9cf4f1c -s ours

am skip reason: subject contains skip directive

Change-Id: Ib5f97e67b54f1775dd567323cf1c2355ae9beb9e