Snap for 5195950 from ab07688245a06769fd74c0cc81df43bcb9c280cc to p-keystone-qcom-release

Change-Id: I1b04587a3cf20c85bccf953cccf2f381add13e15