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