Merge "Snap for 8992082 from 3712afa2cd33760df9b7bb1c2ccc2bef66cfd4cd to gki13-boot-release" into gki13-boot-release