[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 6c624498bc  -s ours
am: 89d5cf3562  -s ours

Change-Id: I85eff76a2b281f12091d0ed0abbbad0bb16da157