Is this marked `@Nullable` at the API level (sorry, didn't check the rest of the PR)?