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