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

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