Merge "Snap for 8992082 from 08a16447ee805a3f5ed51f5fa33d3d764f6a2213 to gki13-boot-release" into gki13-boot-release