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

Change-Id: If4155b1d2bcfd6d8da117ecc473a2f1a366d8e5a