[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 7209c0f074 -s ours am: 274710bcc0 -s ours
am: 95d5b957a1 -s ours
am skip reason: subject contains skip directive

Change-Id: I492db92bf87309f2cb3121f023e678d8fc0e5f17