Merge "Check HIDL Discriminator for CSG Info" into rvc-dev