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

Change-Id: Iabb18c4bf64e31be2185146dea9f8ff79642a336