Merge "Fix ps -Z so it combines with other arguments." am: dd48ffe910
am: 878f0b9c82

* commit '878f0b9c82109b572ac0f7981e77a01fbc41764b':
  Fix ps -Z so it combines with other arguments.