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

Change-Id: I768f0948024a388113ded1b689994c274565acce