Snap for 6339700 from 955da28c313739eeac8e01798f6970c195c22282 to q-keystone-qcom-release

Change-Id: I0b15f4f42f37473b7fcf9ecfab03a614e23fc8f2