am 53fb67a8: am 0c065d9e: Merge change 24117 into eclair

Merge commit '53fb67a8196e75965a5042fdbd83d266980420d9'

* commit '53fb67a8196e75965a5042fdbd83d266980420d9':
  Replace the delimiter whitespace with '\0'.