Merge "Snap for 9066636 from f03f8ab3bfabc6600f967e9506f6d243cf1316a1 to gki13-boot-release" into gki13-boot-release