Snap for 7077657 from fe41f9ca5121c41667cacb6887ba7d381bc8bbfc to r-keystone-qcom-release

Change-Id: I4a6c8e16181301f04dcabebafc0847208c24f5a9