ENG-8423.

Further simplification is complicated because of different types on different platforms.

Depends on D13157

Message visible in UI as failed.

Note: This stack is tested end-to-end according to the process described here.