Merge "Snap for 9204358 from 17da6cad863a83b0579bce1cf8388c6e096bd2b2 to gki13-boot-release" into gki13-boot-release