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

Change-Id: I8aa3eaf68f7e35af8641ddbaed2a22d3909fa43b