Merge "Add counter for out of memory errors"