Snap for 11469542 from 52b322c9344375d6d9be433a315f46a85e6f1106 to 24D1-release

Change-Id: I390804bb6262437d91af832ec68e3567b7223ea1
Signed-off-by: Coastguard Worker <[email protected]>