Snap for 7166018 from 7afa0c6c19f32966900e3bafbb9e874cd1cd4b86 to r-keystone-qcom-release

Change-Id: I1ea05c13896e85484dbf71beda62dd308f605f72