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