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