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