Merge "Merge RP1A.200708.001 Change-Id: Ieb54526d974d1bf64f9fd1820e1772a43a1bab52" into r-keystone-qcom-dev