[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: 1328f9015a -s ours
am skip reason: subject contains skip directive

Change-Id: If9eb54d2a71ffef130d080cbbd170185668c43eb