Merge "Merge SPL-2018-12-05" into p-keystone-qcom