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