Merge "Snap for 9199219 from fd317c72d9fde813458363ec0554097879b7948b to gki13-boot-release" into gki13-boot-release