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

Change-Id: I7392900e32d0a8edb068ad29185cbae134362dab