Merge "Snap for 9199219 from 405069c040a4919891ac206dab1d4ac0b3d3609d to gki13-boot-release" into gki13-boot-release