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

Change-Id: Ic8f7e783335007cff440538411f19b91db87843e