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

Change-Id: I74dc019cf2d81906652c4d8d4ee6e4acb0ce815d