[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 5d25caa87a -s ours am: 823142f20a -s ours
am: 8b6771a4ef -s ours
am skip reason: subject contains skip directive

Change-Id: I9c46794f3a35535d06238c89934dc69a87acfb9f