am 719ca5ad: Merge "Fix erroneous behaviors with OOME present."

* commit '719ca5ade262c5ace6a2ea32a3e4e48619d8439e':
  Fix erroneous behaviors with OOME present.