am 8fbe32a4: am de7e97ad: am c6f10b90: Workarounds for a couple crashes. (Bug 5612584, Bug 5613438)

* commit '8fbe32a420da1a6fb8e56a44738c0892793a9119':
  Workarounds for a couple crashes. (Bug 5612584, Bug 5613438)