Snap for 8084978 from 6b8c187e2b47d57f4a192a9702e95e27a3299286 to r-keystone-qcom-release

Change-Id: I066a604bc49afceea930d32f3b7e6eba905dc2d3