Merge "Snap for 9008587 from 77bbae5871343d78469cbf6b0db7e51e053d890e to gki13-boot-release" into gki13-boot-release