Merge "Further reduce duplication in bugreport ps output." am: 670508d09a am: 1fa95dd57b
am: 91ff9d56d5

* commit '91ff9d56d5991de50b6bda4134121643166727cd':
  Further reduce duplication in bugreport ps output.