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

Change-Id: Ie4ff4dece056127cef83d71aee12cfdb6dde121a