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