Merge "Snap for 9199219 from b129977030d25656da231d79fd553703afedb4e0 to gki13-boot-release" into gki13-boot-release