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

Change-Id: Ia074dd1613cb9e1f9417c926f7d26e7d4ac50926