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

Change-Id: Ie6fe35dcad2e0856623a71cfade5846cc201164e