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

Change-Id: I1faa7656a054811d4f8e8d3405aebdce6d0db629