Snap for 5822255 from a75328b2a559ff2814a0ad74c1f1aaa6e71cedfc to r-keystone-qcom-release

Change-Id: I1dcfcdd03b46c245d7c5c7d93c82cf7c0456bbcd