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

Change-Id: I86affa611c685b9154744b2bffa0639cfdcfea57