Merge "Remove IllegalArgumentException for registration of capabilities" into rvc-dev