Merge "Snap for 7492434 from 75fc3361212e95f9258ed39088d3bb4549b7f894 to s-keystone-qcom-release"