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

Change-Id: I7e6ada7ca49496e0480d020c879fe2dc0d762e51