Snap for 6227608 from 2fd19ddc1b47f65ec91c1ca1b606cb07faf8020a to r-keystone-qcom-release

Change-Id: I041b54b96e47058fa63149c0059d497a689200b3