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

Change-Id: I64f1059af45b3e949ceadacb5fa3a6d0673cd850