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