[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 78d7d26052  -s ours
am: da862d5d20  -s ours

Change-Id: Ia79877cc1e3c9c2f5d2291de95ace253afca37d1