Merge "Workaround for broken \'ps\' command on M." am: b5d31327b2
am: c7576ae0cb

* commit 'c7576ae0cb2ad044ebf911ad09188fd690785c93':
  Workaround for broken 'ps' command on M.