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

Change-Id: Id46bc303aff572011a89e6edf66cd6f80b292a43