Merge "Add champ subchart to oom aai"