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

Change-Id: I84eda0e4e7c932c739598f0dc7329da3d46fd18e