Merge "Reduce duplication in bugreport ps output." am: 8ebad13b34
am: ed59c4e629

* commit 'ed59c4e629c0c72871866e75789e0ece829f4823':
  Reduce duplication in bugreport ps output.