Merge "Snap for 8743232 from d16fc1a2883fc76c03cf8b75a700d49eae92829c to gki13-boot-release" into gki13-boot-release