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

Change-Id: I7e266954f5079fb2bb2cb623e3bc997465916598