Merge "Snap for 8056754 from 6f961dc1473e011476dea9160d5269b557b0b859 to s-keystone-qcom-release"