Merge "Snap for 7077657 from 685c40d92cc8df59cea9cce0a791fd73dca5e8f9 to r-keystone-qcom-release"