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

Change-Id: I5050e66a43c9403cc6dcb304a0a5c7164b15661c