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