Snap for 6568356 from b531ac3e036d60222c496db9587515d4dfadbd6d to r-keystone-qcom-release

Change-Id: I89c3ec838e1788b8d5cb20d342211ef20e29c146