Merge "Update champ and chameleon jjbs"