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

Change-Id: Ie4fe425499914b583ac0009b61527b4c05caded3