Merge "Update global-jjb to v0.25.1"