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

* commit '99294a8735fb6cdd1b8924af6c046886d74d2411':
  Fix erroneous behaviors with OOME present.