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

Change-Id: Iba12d4029216fac93b75e3a6f51845c241fa27bc