Snap for 7338618 from 52f0461625267c22e2ee8a7fafcd79969347ac47 to r-keystone-qcom-release

Change-Id: Ie2a5720a8c9e8ef4ea3d1300293aeb5a03a5aa88