Merge "Add REQUEST_NOT_SUPPORTED and INVALID_ARGUMENTS to be allowed."