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