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