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

Change-Id: Ic6db04e89227b5e28da6fd90b7e07040c55bcb6c