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

Change-Id: Ib49818f0037ce9e7ca80d9e2244de3f7bad7b0f3