Merge change 24948 into eclair

* changes:
  fix [2117464] SF can crash when calling dumpsys