Merge "Merge SP1A.201015.001 Change-Id: Idf7137d68ac83320742eace6e055045c3279f769" into s-keystone-qcom-dev