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