Snap for 6548157 from 7d962f33508663b01404a5eefc27b7f18bcab607 to r-keystone-qcom-release

Change-Id: I8eecdb947903cf4ea807b4585534bf74bf810eb0