Merge "Fix erroneous behaviors with OOME present."