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

* commit '1fa95dd57b61735b816e29c74a7613e261ba538d':
  Further reduce duplication in bugreport ps output.