Merge "Snap for 9066636 from a1d0b53c0b49562e6f65935c2a1833e4f4fd99fc to gki13-boot-release" into gki13-boot-release