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