Revamp of OOM Settings

Change-Id: Ideae53cdf8db439d88ccfa076aabbad42300dbaa