Merge "Add --default-method-call-hook and --default-class-load-hook" into main