Merge "Add @NonNull / @Nullable to DPM return types"