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

Change-Id: I516aa47d5f5b1eb65d3f92b117789b53401030ff