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

Change-Id: I3c069fce603016866144807102041f64dc905a95