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

Change-Id: I79299821dc599f7479ba09ddb5364f01dc1d7903