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

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