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

Change-Id: Idcd32e03f038d9f6ae5df7b54fad8c0f7ef6b4a3