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