Merge "Add msb environment to oom"