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