am b8f5e5f9: am 37994a79: Merge "Fix infinite loop when calling SetStatus after OOM."

* commit 'b8f5e5f9025aea9281712d43cab1c745c494a893':
  Fix infinite loop when calling SetStatus after OOM.