Merge "Remove IllegalArgumentException for registration of capabilities"