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

Change-Id: I1214e99771f4f2af8405bde2a630b64328da8dc2