Merge change 6183 into donut

* changes:
  Fix null data handling in ServiceCommand.writeCommand()