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