Merge "Merge QP1A.190530.001" into q-keystone-qcom-dev