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