am 4df43ab1: am ffc16544: Merge change Ib7c1701a into eclair

Merge commit '4df43ab1d834f839f3b1e535554836a936902d00'

* commit '4df43ab1d834f839f3b1e535554836a936902d00':
  Fix issue #1930911: Crash in system process