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

Change-Id: Ibe1c567b2ff2d32f4287aa9d2bf1d676520cfdd3