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

Change-Id: Ibbac7d2560ba4cfb2fcf82373162b047c7e90cb3