Snap for 7214043 from 00e97c37fb166cb26fa2d49f4df4f4870b308147 to r-keystone-qcom-release

Change-Id: Ic247fbf583e2ff0d98abb64c4872ba58d78e00e5