Merge "ims: Version support for uce feature tags" into r-keystone-qcom-dev