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

Change-Id: I5e90ad757aec9859b8fbdfb9ed240f81a6d44a9e