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

Change-Id: Id3472c2da96db6ec82929bdec1bfd304329658ff