Merge "Snap for 9028518 from b75a2f546457e94b3293ad0ff10c23e20ed1d7e9 to gki13-boot-release" into gki13-boot-release