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

Change-Id: I85f365f5bc991ebefb12500ee1f53b3d250f814a