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

Change-Id: I67eaf373e889c65eb6dc3970f8ddf0ba05a18f3e