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

Change-Id: I0f94f3a65fd6215824d3743025d8902e995c096e