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

Change-Id: I0f0d8078765f95a3092abda819130609b841ac2f