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

Change-Id: Ic4bb026abc66494a8d6dac02f263a520a497f114