Merge "Update jjb jobs for Gizmo and Champ"