Merge "Add @Nullable and @NonNull to module API"