Merge "Snap for 9192524 from f42e94004693383c093e7e1a7f8c0715e9b17784 to gki13-boot-release" into gki13-boot-release