Merge "Snap for 8992082 from 60e2a9b62a69784088406b31d711c3c74e79a866 to gki13-boot-release" into gki13-boot-release