Merge "Fix aai-champ service" into beijing