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