Merge "Snap for 9204358 from 9a3a457f42f171cf0b64983219753ef8e3f52291 to gki13-boot-release" into gki13-boot-release