Merge "Lose ps to toybox." am: 31701d6074
am: e9e8b44d5a

* commit 'e9e8b44d5aed355b1cd71da6ab166c49ec8c4b13':
  Lose ps to toybox.

Change-Id: I411f18cac389fe002c39cb26e08d92588ad6172f