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

Change-Id: I1b1ca7c3fb41586cdbad50f49d67f61ff12c9718