[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 71cf7adf80  -s ours
am: 250f1feb0e  -s ours

Change-Id: I8686e4e09339e93b9834929df52b5af663ada786