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

Change-Id: Iaaa5c19a3da66e504d89a1af6d700b297a301751