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

Change-Id: I8140f4284b9e74cb9c9c7111a9c1237a38356dc0