Merge change 26573 into eclair

* changes:
  Fix bug where onStartCommand() was never called with a null intent.