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