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

Change-Id: I99144c9fe53f843fe2264f53e421931ebc37e1e0