Snap for 6496129 from 2e054a819e128be55ad61bfabba45334d2b2fffa to q-keystone-qcom-release

Change-Id: If9a715005bfbf9d1a1237968457ead6e2211c531