Snap for 6183524 from ee5cd18abfb5e02251d1e2aefa6723cb84f2aea7 to r-keystone-qcom-release

Change-Id: I67a446312da7803117ba065c4550454434bc8f37