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