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

Change-Id: I571ffbbfe7abaa5bb91989061f73097550c939b7