am e47c5a3c: am 48b3f56c: Merge commit \'95a7829c\' into manualmerge

* commit 'e47c5a3c13a4624b10e1d3b4be0fd10f1146c942':
  DO NOT MERGE: Maintain binding to crashed listeners.