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