Snap for 7394016 from 831731c2 to android12-5.10-keystone-qcom-release Change-Id: I6b1ef6a5e09f9e3f394f5afaf45de3e8844f3e9a