Merge "Snap for 9192524 from 9aa012f2eede047135978c1c04f32bb5fd9ee877 to gki13-boot-release" into gki13-boot-release