Merge "Fixing the errors on OOM"

No match.