Snap for 5907899 from 009fcbab7c6997eeb1d187cc093223948671b79b to r-keystone-qcom-release

Change-Id: I5b9e0379453e2f60f5c423ad518a551146fae74e