Merge "Add OOM dependency on Champ"