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

Change-Id: I9ae4a1aa19dbf3a754a9da13bc7385e8bcfe121c