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

Change-Id: I8b35bd696f6bbfff40f38249dc3d93f4d8571512