Merge "Snap for 8992082 from 19372f6f8667deb53510878d77c55afee5eb942e to gki13-boot-release" into gki13-boot-release