Merge "Add appc cdt proxy to oom"