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

Change-Id: Ifd0dd8cb6441b000dc2030b35d6ad135dec2a953