Merge "Snap for 8992082 from 96a0723ab55cbd241d364e3e333d212f40b3164c to gki13-boot-release" into gki13-boot-release