am 7b8f782e: Merge change 6183 into donut

Merge commit '7b8f782eaaef392154fe3acd3ffb48c0a81024e9'

* commit '7b8f782eaaef392154fe3acd3ffb48c0a81024e9':
  Fix null data handling in ServiceCommand.writeCommand()