Merge "Always have ps output to stdout at least one line." am: 4602f2b77b
am: 94f8442f2e

* commit '94f8442f2e5196cfb38cc8e1d8908396fd9c3a35':
  Always have ps output to stdout at least one line.