[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 5f14fa5049  -s ours
am: 274e56a6e3  -s ours

Change-Id: If1a16749cf22593aeda9cad78c7e4f5cd6494341