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