Merge "Add upper-constraints needed by oom"