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

Change-Id: I0de8eac65f9d7ea42d13255c8d3419eb006ff409