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

Change-Id: I959988458fa524fb31392d79c3e8dd7ec80d3da5