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