Merge "Make testProcessMemoryHighWaterMark more reliable"