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

Change-Id: Ie08bda874aabd559c72d721c3fcae5415c482242