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