Merge "Snap for 8084978 from cbdd071b518020ee54f5dd1c795f0ca1f11042da to r-keystone-qcom-release"