Merge "Snap for 9119332 from a6b43f7ba69ed1353860b0f24705215bed3d4db6 to gki13-boot-release" into gki13-boot-release