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

Change-Id: I3d2bb8e2279ab5d66f8f078234bf9f6f7580ab6f