Snap for 4972913 from 31c18b8c407b21d14082a40d57f5ebf0f0dbd257 to p-keystone-qcom-release

Change-Id: Ibae4201e2903e0fb6f5262398b2747dfb3491458