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

Change-Id: I4db6d4eebb8f490a08cfbfcd615818c180e4060f