Merge "Trace oom adjustment"