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

Change-Id: Ia1fe15027c4a98ad25ffcc0439465bf74772a38a