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

Change-Id: I2b3c70cd5903aa11870c09e012dfe3cd4f869a71