[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 01900e65fc -s ours
am: 151132139a -s ours
am skip reason: subject contains skip directive

Change-Id: If54c7cafbf92792da641a840a64d642cda4b37ad