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

Change-Id: I27b2c6eac61b75932a72d3c2d075a7f08c08cb92