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

Change-Id: If1322bf309cf705c0998e59ad3e011aae4d29844