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