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

Change-Id: I960715d0496be2af52a090af8b0715ea61914838