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