Snap for 6096904 from 4a30813cb24bc33cc05c033b99f116dadd1e0696 to r-keystone-qcom-release

Change-Id: Iaa1ff15d700c53da00995ee349cbfee9abe4e04a