Snap for 6665079 from 584412a970c387ee165ecb1e505332048629a4bf to r-keystone-qcom-release

Change-Id: Iebdc3e30bc08046d536964f44d23830ea0adfb9a