Snap for 6239545 from e302c1247ca3fa1f7818cb60a8bae8891ccf84db to q-keystone-qcom-release

Change-Id: I92b1047c883a9ae022e04b3fc11a5ef97f0e0f70