Snap for 6209820 from 5451e698f8b35ade433fa86c2074754b893e9cb8 to r-keystone-qcom-release

Change-Id: Id6709697a5a5342ece2abfb4fb7ca0f72b1b0197