Merge "Snap for 7077657 from 9d5df6e3ccd9fe85ede23f847b763f2dcf8548d7 to r-keystone-qcom-release"