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