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