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

Change-Id: I9cb0552b2bb922836234dbfd50980d2746fe03fa