Merge "Snap for 8992082 from 64b009bd048fe39ade89f13324cfd7dfb5b2f127 to gki13-boot-release" into gki13-boot-release