Merge \\"Lose start/stop to toybox.\\" am: 76ef4e8ae2
am: 6beba74a40

Change-Id: I6b6bd3584ca8d0ab6b5ffdfe907fe180428924a6