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

Change-Id: I2c0f739adff34dba2c7b656d811b6a1984db4848