Merge "Snap for 9203002 from 7014fa9fa31412e6241a8dd47bce62a2ca55af68 to gki13-boot-release" into gki13-boot-release