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