am a79aaeae: am 8c1d1b3e: Merge "Maybe fix issue #9296868: Crash in system process" into jb-mr2-dev

* commit 'a79aaeae551b6ae9d94437505d88bfe3f1bf56ec':
  Maybe fix issue #9296868: Crash in system process