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