Merge "Merge RP1A.200616.001" into r-keystone-qcom-dev