Merge remote-tracking branch 'toybox/master' into HEAD

Change-Id: I651eec6ce683c5dad8e61cd083a75827b2561aca