[automerger skipped] Import translations. DO NOT MERGE am: 42838e2ee7 -s ours am: cae0611e28 -s ours

am skip reason: subject contains skip directive

Change-Id: Ifa05432bcd530b32f9325b5ccfbfb65fe9595e20