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

Change-Id: I7fd8c2a31a12097daa87dce02b0494106f2a6a49