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