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

Change-Id: I034440bdeecc2a804f6b2a431307807dc707dacf