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