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

am skip reason: subject contains skip directive

Change-Id: Ib69fed83fa1c912ddf713b2ed8f1385ae76ff340