Merge "Snap for 9157731 from ad9fbde7de9adfd2516c85810863ed3c8b793202 to gki13-boot-release" into gki13-boot-release