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