am b4ae633d: am 2bed570b: Fix bug 3367627 - spontaneous crash

* commit 'b4ae633df775f99c4c0e47da228d71489d44b353':
  Fix bug 3367627 - spontaneous crash