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

Change-Id: I5691be841726e942f53afe5af0a085481458b3cd