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

Change-Id: I051a990a28d9bdcf458bb8889e3394fcb45903c4