Merge "Add @NonNull annotation to Builder.addXXX args"