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