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

Change-Id: I01f7781b27daf217cdce1f076351f35d6b716f80