Merge "Snap for 8992082 from 30828e80b753c16ba8a210873bdfbd13df57065a to gki13-boot-release" into gki13-boot-release