Cherry-pick 98349bb367418866e008ba22ca75f4ab2984561a to kirkstone #411

Job	Run time
raspberrypi/rpi-test-image/poky/systemd	1h 5m 10s
raspberrypi0-2w-64/rpi-test-image/poky/systemd	1h 9m 24s
raspberrypi0-2w/rpi-test-image/poky/systemd	1h 4m 33s
raspberrypi0/rpi-test-image/poky/systemd	22m 11s
raspberrypi0-wifi/rpi-test-image/poky/systemd	22m 10s
raspberrypi2/rpi-test-image/poky/systemd	22m 36s
raspberrypi3-64/rpi-test-image/poky/systemd	25m 47s
raspberrypi3/rpi-test-image/poky/systemd	22m 35s
raspberrypi4-64/rpi-test-image/poky/systemd	1h 10m 48s
raspberrypi4/rpi-test-image/poky/systemd	23m 4s
raspberrypi-cm3/rpi-test-image/poky/systemd	22m 38s
raspberrypi-cm/rpi-test-image/poky/systemd	22m 11s
	7h 33m 7s

Provide feedback