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

Change-Id: I6d37ded286a4bce04390fca85aa1c36b2a34430d