[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 952acb2ceb  -s ours
am: 3654de4a4d  -s ours

Change-Id: I64a1e8f793284355bd88e977eded0d2c87c3fa3c