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

Change-Id: I0409ab5ffae60156820044018b323b5385692aa6