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

Change-Id: Icec8c3a977acd7e8123d1a7f0a2adf61cc6f59bb