Merge "Add jjb for aai-champ repos"