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

Change-Id: I848c074d07970800eb264858087b159e1680fd56