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