Merge "Align sdc configuration in oom"