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

Change-Id: Ied8b00884c69d87502d4bbc7a20f07acfc4399e3