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

Change-Id: I11da52366c9d592a40a22f4f9de7b2a10dad013a