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

Change-Id: Ib34d094c16349d566a109cc8ec89607aaccdfacc