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

Change-Id: I8f97f17fbec71e1191d97518b73658664eae017a