Merge "Further reduce duplication in bugreport ps output."
am: 670508d09a

* commit '670508d09acf64fad83d0c7ac90330d3db89c861':
  Further reduce duplication in bugreport ps output.