Snap for 8084978 from 9a19bee354ff45dad083c7ae5a1c4616a5be4ccb to r-keystone-qcom-release

Change-Id: Ieaa1bd56a5e6a8c5af67340d261d56465195d16c