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