Merge "Update global-jjb to v0.35.0"