Merge "FR 48725: Support for new rules related to vendor props" into p-keystone-qcom