Snap for 6209820 from 925aaa140246aae4ee9ca6b80f289f73eedec1f3 to r-keystone-qcom-release

Change-Id: I146088cf34baa1814bf7f073c1994810ec584cb1