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

Change-Id: I6c851575bbaf8af83caa2f7c4e95cea9a7be4c63