Snap for 5907899 from 4b901fc1c423effa511f61316a29e2dad96a5685 to r-keystone-qcom-release

Change-Id: I3179571d5139ba7f4158e6cd2014351c3a2b93dd