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

Change-Id: Ic29ef85448390b4cddfc42d4b11a6d62780a6d26